Merge branch '2020-10-12-assorted-encryption-changes'