update locators
Merge branch 'origin/master'
update locator