Merge branch 'hotfix-27' into stable.
Merge commit '15877f4d442a9c418dfa77b610ad7bc5386f4da3'