Merge pull request #16475 from JMAConsulting/core_1577