Prepare for next development iteration

Change-Id: I9fc0b3da0c6feae5ba80ec60d040e5bc2a731716