Merge with v2.6.20