Sync with master branch, obfuscation changes