Prepare for next development iteration

Change-Id: I00bfb0ceb290d4d0c21d8e34da0ba54221ce6571