@sergiomb2 I agree.
@frlan @b4n want me to revert this PR and merge #746 instead? I'll then update #747 accordingly (plus some changes based on feedback there). Someone can then update this pull request to be only for Webhelper (this PR should've been two PRs anyway).