LPS-45070

LPS-45070 Please see comments to my commits. Thnx