Pull request 315 lps 32325

cc: @moltam89