Work in progress. Scheduled before 1.0.