Merge release/cheetah into develop

+1
These hard coded urls aren't very nice