aofs-09 #535 (aofs-09)