Merge branch 'falla_blend_oceano'