Merge in v4.3.1.