Lps 42286; pull request for fix in trunk