Prepare next development iteration

Change-Id: I948fd6fdf6b3f20572dbd2edc5c16748ccef2ae0