Merge "Fix a bug where the last large task index was not being set correctly." into main