SVY-7439 positions of components inside portal are wrong
Merge remote-tracking branch 'origin/master' into SVY-6929-2