LPS-33204 Preserve required return tag