Merge branch 'release/barely_working'
Merge branch 'release/setup'
use packages instead of py_modules
Merge remote-tracking branch 'origin/master' into develop