Merge pull request #4193 from RosettaCommons/guangfeng/galigdock_vs_merge Guangfeng/galigdock_vs_merge