Merge "Fix "Failed to reindex changes"" into stable-2.11