Prepare for next development iteration

Change-Id: I6e24afdf27bd2687c9c162b24fcce6640895a5cb