aofs-10 #607 (aofs-10)