LPS-38405 

@juliocamarero, 

Tested and working, please, send it to Brian as soon as you can (you had already seen the code)