This is new and feels quite important as an introduction. Should it be a separate bug (+ pull request)?