JAL-2388 Update to hidden columns/column selection changes after merge