Feature/mob 2551 swa integration 1