LPS-33204 Preserve required return tag
LPS-33204 SF