updates
Merge branch 'dev' into 2.7-dev