case-3588 - Banner set to proper position
Merge branch 'case-3588' into development