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