Merge remote-tracking branch 'origin/bug/JAL-3049colourCellTooltip' into