Finish the obfuscation work started on e58e895.
Merge pull request #6983 from s0undt3ch/0.16-merge

Finish the obfuscation work started on e58e895.