Post-CVS updates - part 1
Post-CVS updates - part 2
Post-CVS updates - part 3