LPS-45358 Avoid adding duplicate missing references
LPS-45358 Add test case for bug fix
LPS-45358 SF