Merge "Fix SETUP_DATA_CALL handling."