* commit '10914a23f71b42a2b9d08a0199689d84117d5e0c': Allow yet another combination of key management options