This commit is mostly similar to c9b963bc22 as we revert to the previous release.
c9b963bc22
rh #1021112 rh #1023571 rh #1019021 rh #1025007 rh #1012151