Prepare for next development iteration

Change-Id: Icaac7301b3540801e7037f76c09aee9b0c7edc0d