Prepare for next development iteration

Change-Id: I43881d4a72cac726cccff5546b6d37412c1d6e6d