Merge "Multi-threaded keystore"