LPS-40445
Merge branch 'pr-352'