TERMINATOR-24640

TERMINATOR-24640