Migration to master part 2

Change-Id: I64229095e4f6b3ba50cf3d22b92a98bffbfe3929