Merge pull request #409 from JCgH4164838Gh792C124B5/WW-5069_CPickPR404

Cherry-Pick PR#404 into master