Add workaround for ISPN-4969
Merge pull request #6940 from pferraro/web-8.x

[8.x] Add workaround for ISPN-4969