[Hotfix] JT-284