Merge "Ensure weakly referenced callback fields are kept" into tm-qpr-dev