Merge branch '3.3.x'
Merge pull request #6714 from danieltj27/ticket/17390 [ticket/17390] Fix unset template variable for topic approval in mcp