Adding rollback command
Enable agent forwarding by default
Updates & fixes
Merge branch 'rollback'