Merge branch 'daniel/remove-secure-hostname'