Merge branch 'caso1' into cliente_prd