aofs-11 #507 (aofs-11)