LPS-21488 Default to enabled
LPS-21488 Move to one replace