This is code from !3799 (closed) (rebased on paraview/release branch)
paraview/release
Backport: paraview/release