aofs-10 #417 (aofs-10)