aofs-12 #531 (aofs-12)