Fix for struts 0 day issue
Merge remote-tracking branch 'origin/dev-struts-hotfix' into release/2.9.17rc