Prepare for next development iteration

Change-Id: I16b6a3af1c4940fe3b2ce38bfd207d083bb9e38a