Prepare for next development iteration

Change-Id: Ic0b9bc9441ca4bd4f3e5becbf5586bc421641ca9