rAKA/master-stable

bugfixes/ci_deploy_fixes