Merge "API cleanup: add boolean param to setEnableRollback"