Merge branch 'feature/JAL-3093wrappedModeTooltips' into