Merge "Use private key context when necessary" into jb-dev