Resolves: RHEL-4285 (cherry picked from commit 7dd2753148)
7dd2753148
Resolves: #2231464 (cherry picked from commit 7cf6f11e42)
7cf6f11e42