Merge branch 'intech' into servant

Change-Id: I0cf9bebca8da9977b7f9a5a8df5f05498f7c7082