taking over changes from update to RC3 without common and color