LPS-50227

First implementation of the LPS-50227 for your review and comments