Merge branch 'shipherd_hotfix' into release