Rescue next_status problem
Merge branch 'distribution-plugin' into cirandas