Prepare for next development iteration

Change-Id: I2e36aa826fe5f61077dbf522ea375c33325d6f0a