Merge branch 'pm/build-persistent-https-with-recent-go'