LPS-38391 Fix new staging bar - review commit by commit