Merge 2 GC CLs to stable

[whesse]

Please merge
97a8c4c
and
9d5e133
to stable 1.17.

This fixes an issue where the GC could free a weak property's value.

[whesse]

@mraleph @mit-mit

[whesse]

Merged in version 1.17.1