Prepare for next development iteration

Change-Id: I05d9ce634b589f601a334dcc2c93a29796cd1c3e