LPS-46537 Account for additional custom properties