aofs-09 #635 (aofs-09)