changes required by merge of chipper 'single-file' branch into master