Resolved merge conflicts
Merge branch 'hotfix-6.1.2'