- merge; service API change