Merge 7.x 2.x into master