aofs-10 #333 (aofs-10)