Gardening after merge 3b36608 6b70887