DS-841: editing the table view again