D-16007: Update based off of QE recommendations.
Merge pull request #779 from rackerlabs/D-16007_patch

D-16007: Update based off of QE recommendations.