Merge "Default EDITED column to CARRIER_EDITED instead of USER_EDITED"