Prepare next development iteration

Change-Id: I65b4d11a0503ddc736e666006fa4f06f504d9e68