aofs-10 #358 (aofs-10)