I'd recommend cherry-picking stuff like this into master sooner than later. It's probably best to keep the PR diff just about the mapper extraction.