Prepare for next development iteration

Change-Id: I5512a858cb81aeeaa18aab581653192706ce04db