Merge release/cheetah into develop

Im running out of bullets now