Prepare for next development iteration

Change-Id: I94415d77c4de048464c60cf73e3c147fb40e1447