LPS-32405 Edit comments