test new cond vars
Merge branch 'develop'