aofs-10 #526 (aofs-10)