Offboard swalling

RT 8507
Change-Id: Ic74ec454524dffe79fc8c15437f4e19214f6aa72