Prepare for next development iteration

Change-Id: I49f5b09301353db69afa5dd44d7c3c96a23724dc