2.7.x-github

For discussion only. Do not merge.