[Hotfix] JT-1222