LPS-38437

Hey Brian, resending this without the javadocs (I am sending that to Jim for review). Thanks, Zs.