[950189] Rebased and separated out TreeWidget modifications