cleanup: setup,delayed
Merge branch 'hotfix/0.5.2' into develop