[cgma-dev] r6031 - cgm/branches/merge-cubit12/test