rebased against latest master

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>