LPS-48375 master