LPS-49681 master