Merge remote-tracking branch 'refs/remotes/origin/main' into basop-2262-fd-cng-buffer-is-not-updated-test