aofs-10 #393 (aofs-10)