59b8054
Initial commit from code review [1] [1] - https://bugzilla.redhat.com/show_bug.cgi?id=1343814
