aofs-10 #616 (aofs-10)