Merge of recent changes