Merge pull request #12074 from JMAConsulting/dev_core_98