Lps 42286; pull request for trunk