Merge branch 'hotfix/better_errors2'
Merge branch 'release/tbag_nabo'
fixed more tbag stuff
Merge branch 'hotfix/tbag' into develop