aofs-11 #578 (aofs-11)