Prepare for next development iteration

Change-Id: I2e981c5f39f33b8ea070c6e07f87cb4f12b6d354