Merge release/cheetah into develop

Isn't the goTo mixin removed?