Prepare next development iteration

Change-Id: I929b497a372661ae272337771c19014a8c5e775f