Prepare for next development iteration

Change-Id: I6c45db343fde16961bb367ac60ecd4274a0f1205