Not really satisfied with the HA split but let's just say it's a
work in progress...

(cherry picked from commit 16503424)