Pull request 377 lps 35317