Prepare for next development iteration

Change-Id: I9a7e06cc7545ca75d7293e070f8d93b21f62dbf3