aofs-10 #368 (aofs-10)