Prepare for next development iteration

Change-Id: I383cff4cdb0ccf47e33ccb6146b55b0c52cf2544