Prepare for next development iteration

Change-Id: I1b7aef3735d0ef91617f7dd13831b0da1cd67593