LPS-35161 [TOP PRIORITY] resending after fixing conflicts