Merge "Remove security settings v1 code"