Pull request 1169 lps 32584