LPS-44206 Initial commit, not to be sent to master