Merge release/cheetah into develop

The guilty one should be shot for not translating code.