Merge of new rebased code

No match.