do not enforce inconsistent behaviour
Merge branch '8.34'