PDI-9031..9034: Added support for High Availability clusters