Revert "Revert "Merge branch 'erick' into python""

This reverts commit ff9abd94daa4f3b8e9d6a8823912c3c8ed223f4f.