incorporate all needed *stripe/classic changes until toolkit and suite moved from...