Prepare for next development iteration

Change-Id: Ia4729aa159e342a9743c2829acd8b265156df225