MP-3996 fix final arbiter issue with auto register