Merge remote-tracking branch 'refs/remotes/origin/main' into basop-2262-fd-cng-buffer-is-not-updated # Conflicts: # lib_com/options.h
