Merge of new rebased code