Pull request 1187 lps 32525