Merge pull request #412 from JCgH4164838Gh792C124B5/WW-5072_CPickPR411

Cherry-Pick PR#411 into master