Merge pull request #14064 from JMAConsulting/core-338