merge api_control into devel