Patch release to push out critical fixes.

Need to include - #5313. This is a critical bug fix for HA enablement on Multinode.