Prepare next development iteration

Change-Id: I8b2902ade13173a4bf476d9aed6594d3185a1a99