api06: Merge changesets code from Frederik.