Merge "Test template css changes"