Merge release/cheetah into develop

Use a blocktrans here to deal with the % sign