LPS-46853 Re-add - SF
LPS-47071 Re-add - SF