cherry picked
Merge branch 'master' of github.com:harlo/UnveillanceCore