aofs-10 #365 (aofs-10)