Adjusted for next development version.