Merge "Fix unsafe weak reference usage in test 141"