Merge release/cheetah into develop

This is good. When we have a % sign in the handle we should use blocktrans.