Partial merge of exact into master