Prepare for next development iteration

Change-Id: I25e902904b52b564dbb7c0c0304cae6845e2f300