Merge branch 'issue-3061'