Applying patch for LPS-29645 from 6.2.x branch