Merge branch 'classbasedesc_doprivileged' into 'ibm-trunk'