Merge pull request #403 from JCgH4164838Gh792C124B5/WW-5068-26x

Proposed WW-5068 change