Merge "Improve local color extraction handling." into sc-dev