resolves: RHEL-56814
resolves: RHEL-50563
resolves: RHEL-46869 (cherry picked from commit 4ca1dbba4b7aba2b9eb4fc93a7a740922524e958)