Property id in resources for multi property support

[chmstimoteo]

Description

Please provide a description of the changes you have made in this PR.

How has this been tested?

Please explain how you have tested the new changes.

Checklist

• I have commented my code, particularly in hard-to-understand areas
• I have successfully run the E2E tests, and have included the links to the pipeline runs below
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• I have updated any relevant documentation to reflect my changes
• I have assigned a reviewer and messaged them

Pipeline run links: