Issue 1091 - Implement a better templating approach for Element Hiding Helper

--HG--
extra : rebase_source : 525fef9d356da789f210e741f6fad29314d85905
extra : amend_source : 38b566403ef3034052e5d2584929f42d2268aa9f