SOS-1518

6.2.x CE backport for User Bar