aofs-11 #522 (aofs-11)