Prepare for next development iteration

Change-Id: I1657ff42052fabad77cddeaff9b9b48d5de2dd61