Merge con resolve de issue GINN-6 de master a blade-runner.