Merge branch 'cnfvar-review-improvements' into master