This is a partial backport of !1911 (merged). This contains the bug fix updates that are safe for 19.08.