LPS-48488 Adapt it to master