Merge branch 'hotfix/fix-search-jinja-template'
Merge branch 'release/1.2.0' into develop