Merge remote-tracking branch 'remotes/origin/main' into 996-self_test-prm-and-self_test_ltv-prm-are-out-of-sync