[development] Changes in contrib CVS