Merge remote-tracking branch 'devel/bettersetupruntime'
Merge remote-tracking branch 'devel/fix_vcs_marker_test'
Fixed? probably had to do with image size
Merge branch 'fix_hurricane_test' into devel