LPS-40102

For master