refactor(ripple): unfortunate squashed merge from master to keep the branch properly synced