Prepare for next development iteration

Change-Id: I88b972c190c4dad06e8d471bdc4aa8a8dd989577