Merge branch 'feature-linux-support'