(cherry picked from Fedora commit 90042e64239d396e6ebdfab7f4d85516fd38a5ec)
Resolves: RHEL-309
Resolves: rhbz#2051483