LPS-45008 SF
LPS-45008 Don't override default values
LPS-45008 Order