aofs-11 #555 (aofs-11)