Merge branch 'v4-13-stable' into 'v4-13-test' again for the 4.13.9 release