[development] CVS contribtions/sandbox changes