Pull request 1194 lps 32777

Hey Ray,

Can you review and push to Brian?

Thx