Merge release/cheetah into develop

Pgew!