aofs-08 #640 (aofs-08)