Prepare next development iteration

Change-Id: I59927ddcda7c01bece70d3874c1f737a0296a69d