Merge changes from topic "cdm-proper-persistence"

* changes:
  Ensure cdm clear cache command persists state
  Avoid accumulation of user state persist requests