Merge FeatureȘ Payment helper

This partly fixes the story #66922784