LPS-49796 master