merge framework changes