Minor code changes extracted from #8151#8176

Merged

fregante merged 4 commits intomainfrom F/bugs/extras

Apr 8, 2024

+314-263

Commits on Apr 6, 2024

Commits on Apr 7, 2024

Merge remote-tracking branch 'origin/main' into F/bugs/extras
fregante
committed