[IMP] account_payment_blocking headers consistency, better description, better imports