Prepare next development iteration

Change-Id: Ie20e41fdbc8104cea75055207b42876aebb355a3