Revert "Revert "Merge branch 'hotfix/1016'""

This reverts commit 0b0496ad9bd1f140b2bfb1c93ed0aaec786b80f0.