Merge "Isolate encryption-related methods" into feature/zuulv3