manual wip
Merge branch '1_4_refactor' of https://github.com/Strider-CD/strider into 1_4_refactor