[Hotfix] JT-507