Merge Dave's 2.7 changes