Merge "Remove unused field from StagingManager"