Merge of 12-03-2014