Prepare for next development iteration

Change-Id: Ic01bfb093b4d8af7ad588cf9c3d0809af14f0adf