Merge branch 'v2.x' into v2.x-merge-master-20240930

Author: johnnyshields

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-11 13:04:30 UTC using RuboCop version 1.64.1.
+# on 2024-09-30 20:46:06 UTC using RuboCop version 1.65.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new