LPS-43398 master