aofs-10 #636 (aofs-10)