dev/core#513: USe payment_instrument_id instead of payment_type to determine the...