Merge "Add keystore2_client_tests" into main