Prepare for next developmen iteration

Change-Id: Id5426712f9c708ba12edf8d4cd9451de336a1885