aofs-10 #637 (aofs-10)