UAR-863 fix the missing padding on some panels
UAR-894; Merge branch 'UAR-863' into release for release9