LPS-30154

Re-pull, please review.