Merge branch 'caso2' into cliente_prd