Prepare for next development iteration

Change-Id: Ia1707beb58bf95af55f70096649161b91a65ada2