Merge pull request #12613 from JMAConsulting/core-issue-297