Merge release/cheetah into develop

TRANSLATE!