working Linux version
Merge commit 'a0b3a7e35719c52f51dc09d952855a45bbb7998e'