aofs-10 #421 (aofs-10)