aofs-10 #608 (aofs-10)