Merge "Prevent issues due to template caching"