merged from cc-1.6