Merge branch 't35_custom_css_values' into 42cc