LPS-46154 master