Merging framework changes