Merge branch 'bug-5735'