First commit on branch dev

Change-Id: I1365aca2e98fe73428ac6326b1494e2f55ac73c0