This pull request encompasses a few commits (3).