6435/truncate alert

I don't get why Github reports this as a non-automatic merge. The branch is freshly rebased on master.