Prepare for next development iteration

Change-Id: I4437a969d28521fe4c9712966859a7c424ea1d03