Merge "Updating more spans"