Merge "Hard-fail get-/put-object to a non-reference field."