Prepare for next development iteration

Change-Id: I521a0b93f5f0b09bb9ea789d954886490ebde9c2