Prepare next development iteration

Change-Id: Ib175411b9d6fc460e4276470e133eb99ccccffde