Upstream patches: 13ecc3921fb1566c2af7b80d5cb515d8fc4e5ec9 130d6b91694a93a142be8c3767bfc711245dea1c Resolves: RHEL-68979