aofs-11 #633 (aofs-11)