Prepare next development iteration

Change-Id: Ic3be5e41da53b585c19563897b7112de33900a7e