Merge branch 'release/1.2.0' into develop
urlResolver
urlResolver test
ver 1.2.1
Merge branch 'release/1.2.1'