This particular change you can simply add as another commit on top this PR if you like.