Prepare for next development iteration

Change-Id: I7c3bd77c62bfe4a7e816dd518b67f5248638a9fd