Merge pull request #3689 branch 'hotfix/3684'