LPS-43453

Hey Hugo,

I wasn't sure about the "ORGANIZATION_STAGING_SUFFIX" but I thought since we're using it in two places now it'd be better to have a variable for it. Also, there is some info about the fix on the LPS. Let me know if you have any questions.

Thanks.