possibly finished working on the linux feature.
Merge branch 'feature/LinuxFeat' into develop (after rebasing forward the other changes from develop)