Prepare next development iteration

Change-Id: I3df799e44372939ea0b61c83d69908cc2e23d05a