D-16007: Update based off of QE recommendations.