#18077CSH not working in flexforms after merge of patch from #17932
Description
The patch in #17932 does not work with the new flexforms CSH (see bug 0007028), but that is easily fixed by the attached patch
This bug supercedes my comments in #17932.
(issue imported from #M7317)
Reviews 0
No change resolves or names this issue in its commit message, and no comment links one.