LPS-40331 Staging part for the role performance problems

Hi Shuyang,

You are probably already familiar with the set of changes @laszlocsontos is sending you lately this is the staging related one. I have reviewed the staging changes they seem ok to me, but you might want to check out the rest.

Thanks,

Máté