Fixed cace sensitivity issues for linux/mono builds
Merge branch 'dev'