Display Optimizations in 6.17

RH-54193 is fixed in the latest Service Release Candidate