pre-2.7.0 prep
preping for 2.7.x