aofs-11 #474 (aofs-11)