Prepare for next development iteration

Change-Id: Ie239e555153215eaf6f6b5f3f68027bdc1c937d9