Lps 40317

Brian, this ticket is not done yet, please don't close it.