Merge branch 'distribution-plugin' into cirandas