Bumping this to 1.8.1 target because it doesn't look critical and we'd like to code freeze.