Prepare for next development iteration

Change-Id: I562c45ad5a83f1c3643030f1fcc9a7d2f497896a