Prepare for next development iteration

Change-Id: I8b1e2ff588978e6c14cf63c1767a70b16e48bb7d