Prepare for next development iteration

Change-Id: I49eb41707af18c65a8742412f469a38c855ab527