Pull request 1202 lps 32399