7.x-3.1
3e12ce9c · Issue #2671328 by rlhawk: Backport encryption key type changes ·