Merge branch 'sileht/pr/rabbit_hosts_ha' into sileht/grizzly-dev