aofs-10 #399 (aofs-10)