Merge "Test remotely initiated rekey"