Merge branch 'issue-2232'