The PR addresses issue mentioned in issue #12839. Existing test scenarios pass and new one is added to affirm that resolution works.