Merge branch 'harvest-master' into option_adding