Do not add -in to the hostname to get the IP if running on the merger
Merge branch 'release/0.3.1'