aofs-10 #615 (aofs-10)