aofs-11 #535 (aofs-11)