LPS-48932 Proper reference cleaning and proper visibility for references inyection
LPS-48932 SF
LPS-48932 auto SF