Smp cleanup upstreaming v2 #11

Closed krystian-hebel closed 1 week ago