merge of new master updates into branch