minimal design changes for evolvis
Merge branch 'master' into debian