Merge branch 'feature/JAL-3093wrappedModeTooltips' into merge/JAL-3093_JAL-3132