Merge branch 'cnfvar-api'