Merge pull request #9261 from annando/relay-distribution