Bug/987628

The start of the implementation. This is not complete or ready to be pulled. See BZ comments:

https://bugzilla.redhat.com/show_bug.cgi?id=987628#c9
https://bugzilla.redhat.com/show_bug.cgi?id=987628#c10