Stable before release of 3.5