FEND-924: Firefox and chrome issues for references
Merge remote-tracking branch 'origin/hotfix/FEND-924' into release/2.5.5rc