PR for #1971 against 3.4.

Relate to #1971