manual merge of osc branch