Merge branch 'cipy-use-generic-variables'