Integrated @BFALacerda's latest changes.
Integrated @BFALacerda's latest changes.

mudrole1/strands_executive,bfalacerda/strands_executive,mudrole1/strands_executive,mudrole1/strands_executive,bfalacerda/strands_executive