Merge branch 'caso4' into cliente_prd