Migration to master part 2

Change-Id: If65fa11b534c064b4008d20592e1b043ea7c3245