Merge branch 'v4-19-stable' into v4-19-test