LPS-32034 overrides