aofs-09 #631 (aofs-09)