Merge branch 'cnfvar-deprecations'