aofs-10 #363 (aofs-10)