Merge branch 'shipherd_hotfix'