LPS-39277 Recommit
LPS-39277 Fix tests
LPS-39259 Default value should be false