CVS updates for 21.5.b16