Merge proposals dependent on lp://staging/~xavi-garcia-mena/keeper/ual-moved-to-helper-class

1. ual-moved-to-helper-class
2. Dependent merge proposals