Fixes for linux
Merge branch 'feature/linux_bundle' into develop