Minor refactors split from #3591#3592

lann wants to merge 4 commits into

mainspinframework/spin:mainfrom

minor-refactors-split-from-3591spinframework/spin:minor-refactors-split-from-3591Copy head branch name to clipboard