Merge with v2.6.20-rc7