Allow an "instance name" to be set.
Merge remote-tracking branch 'upstream/master'