r16750: merge fix for BUG 3905