Merge pull request #4932 from danmcp/master

Merged by openshift-bot
Turn off direct addressing