Prepare next development iteration

Change-Id: I706305038bc4c87fb820f5dbe1ef694ab8a7f131