aofs-11 #478 (aofs-11)