Prepare for next development iteration

Change-Id: Id1e727308f8409cbf3b056c3b5c98de4940fc71c