Merging master into 19.0.