Re-added skip_cleanup: true option