aofs-10 #629 (aofs-10)