LPS-43591 and LPS-45491 Apply fix at the LocalService level