aofs-11 #542 (aofs-11)