Prepare for next development iteration

Change-Id: Ic65d3da0bbb2074a810811b0e7a09ae8fd1f68cf