Make compatible with 2.2RC1, 2.2RC2, 2.2RC2A

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>