aofs-09 #640 (aofs-09)