r5559: adding missing changes from 3.0