Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into...