LPS-48383 master