LPS-33278 Move logic
LPS-33278 Regenerate