Merge branch 'condapackage' [skip ci]