aofs-09 #610 (aofs-09)