Merge into 'backspace_rework'. See @kilink's PR #7