aofs-10 #625 (aofs-10)