ITACLOUD-117: Fixed overflow caused by the scrollbar
Merge remote-tracking branch 'origin/rdemo2' into rdemo2