This fixes ABI issues and incorporates previous patches Related: #rhbz1981316 Signed-off-by: Simo Sorce <simo@redhat.com>