Prepare for next development iteration

Change-Id: Iefe45967ec74b39abe481d2e09cd33d66390a1a3