LPS-45636 Should use set instead of list to avoid duplicated fileds.
LPS-45636 SF
LPS-45636  SF
LPS-45669 SF