Merge pull request #428 from JCgH4164838Gh792C124B5/WW-5083_Followup

WW-5083 PR#426 follow-up.