Prepare for next development iteration

Change-Id: I39fd0b7deaaf1fc21bdc1c1c341236de7f20573e