This is a missing patch file that I wrongly dropped during the rebase of our patches to 3005.1.

This SR just brings the patch back to fix the issues found around "collections.Mapping" not existing. Changes from this patch are still in "develop" branch and not yet pushed to upstream.

I'm autoaccepting this SR as these changes were already part of our package.