Fix XSL filter
Merge branch 'release-3.4.x' into release-3.5.x