Created template plugin, variable context, and join variable context with variables
Merge remote-tracking branch 'origin/master'