Merge release/cheetah into develop

Pow