Seems like: I'll going to file a separate ticket about potentially misleading messages after the merge.