CLC-4322 Fix persistence logic for opt-in/out
Merge pull request #3020 from ctweney/clc-4322

CLC-4322 Fix persistence logic for opt-in/out