aofs-10 #407 (aofs-10)