Merge "Heat templates for vFW and Traffic Distribution"