Merge develop into cleanup

[AliSoftware]

This re-syncs the new commits from develop with the toolkit-cleanup WIP branch.

This first requires #214 to be reviewed and merged, hence the Draft state for now.

How?

• Merged develop into intermediate merge-develop-into-cleanup branch, cut from cleanup/rubocop/step5 to solve the conflicts.
• Added some commits onto that merge-develop-into-cleanup branch to solve the new rubocop violations introduced by the new code from develop.
• Once [rubocop] Step 5 #214 gets merged into cleanup-toolkit, GitHub should automatically update the base branch of this Merge develop into cleanup #215 PR to cleanup-toolkit, then I'll un-draft this PR.

┌───────────────┐
│cleanup-toolkit│───────○───────────────────────────────────────────────△─────────────▷
└───────────────┘        ╲                                             ╱
                          ╲        △ #214         PR base change
┌───────────────────────┐  ╲      ╱              when #214 merged    ╱
│ cleanup/rubocop/step5 │   ○────○ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─○─ ─ ─ ─▷
└───────────────────────┘         ╲                                △ #215
                                   ╲                   fix        ╱
                                    ╲        fix     rubocop
┌───────────────────────────┐        ╲     conflict violations  ╱
│merge-develop-into-cleanup │         ○────────◎─────────◎─────○
└───────────────────────────┘        ╱
                                    ╱
┌───────────────┐                  ╱
│    develop    │─────────────────○───────────────────────────────────────────────────▶
└───────────────┘