Merge branch 'main' into 101-fd-cng-encoder-handle-initialization