Merge "Add configuration for main rollback index location" into main