Work draft variant

Change-Id: I494b60a329b0661758f72bb740e19ab5334d2355
Alfa version

Change-Id: I96e3daac95ee76205045904c84d62795b4fff1e4