Merge remote-tracking branch 'origin/main' into 101-fd-cng-encoder-handle-initialization