Cleanups
Update copyright year
Merge branch 'cv_dispatch_client_common_2' into cv_dispatch_backward_compatibility