aofs-11 #577 (aofs-11)