Manual Merge 7.2

Signed-off-by: Maikol Guzman <mikeguzman@gmail.com>