update to 1.2.7
Merge branch 'upstream' into CoApp
work in progress