[Feature]: Cherry-pick from anthelion

[pl4nty]

What would you like to see changed/added?

Also commit and iterate on rebase script

https://github.com/unpn-org/Komac/commits/anthelion/