aofs-08 #619 (aofs-08)