Merge "Load default KeyFactory instead of BC's implementation"