aofs-07 #619 (aofs-07)