Prepare for next development iteration

Change-Id: I997cd86c038734a217f7a402375b16a80dc81ef3