Custodian security

Pair: Andy and Abhinav

Reviewed: Paul and Bill