Prepare next development iteration

Change-Id: I97f7fe059c1d3d40b6f8f73e4c6fe9990f2d47d3