Fix remove from order
Merge branch 'distribution-plugin' into cirandas