r215: merge over svk fixes from 4_0