Lps 37352

rebased and resolved merge conflicts; tested rebased commits