aofs-11 #479 (aofs-11)