Merge branch 'hotfix/missing_bars_plugin'
the future plugin somehow got missed
Merge branch 'hotfix/missing_future' into develop