Prepare for next development iteration

Change-Id: I12641d63bd29adfdd3a3c6d801a42420a74f5686