Prepare for next development iteration

Change-Id: I75a5127ee02c00581b9ea28b95ca6c5ed4c1ac45