Trying to go a bit more towards an "auto-generate by default" approach, with manual overrides where needed.
Reviewed-on: #1902
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>