Merge remote-tracking branch 'origin/features/JAL-2814ftsHelp' into merge/JAL-2814