Prepare for next development iteration

Change-Id: Ic8447596d9319bc3a7f90f820f073ed3c9ba1bd4