aofs-11 #628 (aofs-11)