LPS-37434

Hey Mate, second attempt :)

I removed all the validation part.

There are several commits that I added just for you, but I would squash them with yours in order to make it easy for Brian to review. Feel free to modify/squash them as you feel it is easier to review...  let me know what you think...

thanks a lot!