This commit partially backports commit AyuntamientoMadrid@f038399 by taking only the parts affecting code already in CONSUL's main repository.
This commit partially backports commit AyuntamientoMadrid@f038399 by taking only the parts affecting code already in CONSUL's main repository.