Merge of 17x into master