Master to cv rework

Merging Master to CV Rework branch