Prepare next development iteration

Change-Id: I9b4652d75e2b5eeaa7349eec04fd00feb6010f6a