2 Commits (fix/8667-wh-pay)