aofs-07 #636 (aofs-07)