Merge pull request #15955 from JMAConsulting/core-1420