Prepare next development iteration

Change-Id: I493a16377814f797280845dcea90a26fdfcf867c