marged from cc-1.6 part1