Merge 7.x 1.x into Master