LPS-48939 Only set values if the property hasn't been set