U4-4949 - fix issue with domains
Merge remote-tracking branch 'origin/7.1.4' into 7.1.4