Merge branch 'hotfix/release-1.2.11'
Merge branch 'release/release-1.2.12'
updated release number for prod release
Merge branch 'release/release-1.2.13'
changed version number for release
fixed merge conflict
Merge tag 'release-1.2.14' into develop

release 1.2.14