aofs-10 #369 (aofs-10)