Merging 452_payment_required_per_pricing branch