HTML-510: Refactor IncludeIf and ExcludeIf to be processed as regular tags