Merge pull request #2572 from benthecarman/rexport-route-hint-secret