Merge "Expand deletion preferences." into oc-dr1-dev