SOAP-1747
Fixed bug where the preemptive setting wasn't correctly saved.
Fixed merge conflict.