Merge "Secret code fix - uses public symbol for secret"