Merge pull request #7694 from eyakubovich/master

Add an option to disable IP masquerading