LPS-45105 Don't override default values