aofs-10 #628 (aofs-10)