Feature/mob 2147 swa integration 2

super should be called first