Merge "Add feature to disable rollback edit count"