locators final
Merge branch 'master' into Antanas3