aofs-10 #478 (aofs-10)