LPS-43952 Changes following peer review suggestions