Merge release/cheetah into develop