aofs-08 #531 (aofs-08)