Merge branch 'release/1.1.0'
Merge branch 'release/1.2.0'
simple locator rewrite