aofs-10 #581 (aofs-10)