aofs-11 #583 (aofs-11)