aofs-09 #619 (aofs-09)