Not sure why this invalid code worked on windows
Merge branch 'develop' into feature/technicallyerik-wip