LPS-44579 Fixes accepted, plus small changes following the same lines