Pull request 1218 lps 33173