Merge pull request #12058 from JMAConsulting/dev_core_91