Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975' * commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975': Reduce the number of keystore connections to 1
Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975' * commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975': Reduce the number of keystore connections to 1