Merge branch 'v2.6.36'