Merge in Foundation 4.3.2 (commits squashed)