Lps 37352

committed on top of current upstream/master f22348440476dfe46ba03715cf32c502f6f0fdf4