:) To have this all on the same branch I cherry-picked the relevant commit and pushed to this branch.