merge phelipealves-integration into pr39