Issue created solely for changelog; already merged in another commit.
Issue created solely for changelog; already merged in another commit.