Merge "Reduce number of weakrefs per frame" into sc-dev