[TASK] ~~ last change + disable DataSet assertions

Change-Id: I734c31d6cdf9d9fede43c2d0887c0cc1f0092bb4