Prepare for next development iteration

Change-Id: I2557fbd1fd7813b7d007c3090caf5a06babde526