aofs-10 #633 (aofs-10)