Prepare for next development iteration

Change-Id: I6430f3d687573fafe5b3f8f8d04745281d23ff35