aofs-11 #580 (aofs-11)