Merge gardener patches from 1.1.0-pre.