aofs-10 #366 (aofs-10)