Merge branch 'main' into 168-wrap-agc-encoder-cmd-inside-debugging-macro