Merge "Fix behavior when primary fails initialization"