Merge 'origin/v4-10-stable' into the real 4.10.4 release