Prepare for next development iteration

Change-Id: Ibc22737dd8e10744748e16f4755a522c17ead409