Retested master

Change-Id: Ic6ffc9c34d13ee03cb3fcec73fc22f7e90b7721b