LPS-46232 Update usages
LPS-46232 Unrelated SF - Move it where it is used