Bz1120897

Pull request to address BZ1120897 - https://bugzilla.redhat.com/show_bug.cgi?id=1120897