Merge branch 'main' into 400-disabling-agc-debugging-option