LPS-48681 master