[TECH SUPPORT] LPS-35604 LPS-35773

The commit for LPS-35773 does not need to (and can not) be backported to 6.1.x