Merge "Fix framework crash" into sc-qpr1-dev