Prepare next development iteration

Change-Id: I7debecf51a041b37d494a0a0405c35f796ba8d55