CLC-3225 Move CCN zero-filling to more central spot
Merge pull request #2088 from raydavis/raywip

CLC-3225 Move CCN zero-filling to more central spot