Prepare for next development iteration

Change-Id: I9a2e8ca5b7344e365b0fb71cf690c27836b120f3