Merge "Fixing default behavior for keys requiring auth" into rvc-dev