Updated to latest upstream changes

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
WIP