aofs-11 #549 (aofs-11)