Merge remote-tracking branch 'origin/v4-10-test' into HEAD