Prepare for next development iteration

Change-Id: Ifef4e1dafe4d516df09f61b50ad95f5ee5b6ddf9