smw and srf to 1.8.x branch

Change-Id: I6ddc2fdfa348c9a163510eb3b1a368f13d969fc0