To be tackled at the very end of the 2.0 release cycle in case we need/want to roll another 1.x release.