aofs-12 #619 (aofs-12)