Merge "Add option for confirmation prompts on rollbacks"