LPS-33293

depends on LPS-33292