Merge from master into feature-wet-v3.1 branch