Merge branch 'main' into 512-remove-deactivated-code