[MERGE] applying framework changes