[Hotfix] Fwd: JT-1308