Merge "RemovalClient should preempt auth" into sc-dev