LPS-39202 editted properties

Hi Tom,

I found that the source files conflict on rebase with upstream master. Can you rebase and resolve them?

Thanks,
Jim