Prepare for next development iteration

Change-Id: I4d16bf1c2596fb96cef90c5f42dc47aba5d78cf8