LPS-34360 SF
LPS-34360 Regen
LPS-34211 Using resourceGroupId for scope permissions when it's available