Merge branch 'hotfix-4.2.3'