OK, so maybe it should be fixed in 2.3 instead and then merged into the new code