#11694: merge with 3.4