Merge pull request #3017 from thess/relayctl-update