Merge Feature: Payment helper

This partly fixes the story #66922784