Prepare next development iteration

Change-Id: I5175f99ea2dc7cc03c85e11a9817951316d98670