As we are hitting this more in cu cases, I wrote the following KCS, but need to verify if this is a good solution per engineering team +1. https://access.redhat.com/solutions/6889971