aofs-10 #425 (aofs-10)