aofs-10 #373 (aofs-10)