Prepare for next development iteration

Change-Id: I67febfc4b3b29cd48538c79e4520cd3f25944919