Merge master into add-shapes-to-garden-plan