aofs-10 #594 (aofs-10)