r16119: pulling changes from 3_0 up to r16117