aofs-11 #505 (aofs-11)