Merge pull request #13527 from JMAConsulting/core-693