Merge ccdamultiview

Merging clean-up