Branch not yet created in repo, asking everyone if they agree on the approach:
@ltoscano @heikobecker