aofs-11 #619 (aofs-11)