merged clrs changes