Merge resgate/master