Move endpoints. bugid:111790