Merge branch 'main' into basop-2262-fd-cng-buffer-is-not-updated