Merge pull request #12463 from JMAConsulting/dev-core-237