Reintegrate Soledad
Merge branch 'reintegrate-soledad' into develop