LPS-51370

@SamZiemer @jonathanmccann 

Can you please review/test my changes and if everything works send it to Brian?

Thx!