aofs-11 #626 (aofs-11)