Merge pull request #18719 from JMAConsulting/core_2105