Prepare for next development iteration

Change-Id: I64307bedba32939d5d290e8ec2362fd2b4e4d3a1