Merge "Add test for Status->merge with overrideValue true"