reverting merge of 1.2 into master