manual merge of relevant updates from master