[MERGE] merged framework changes to branch