LPS-46267 SF - Avoid chaining