Prepare for next development iteration

Change-Id: I110166c1f0a8081f608c3da961edf5cc65effa6e