More stringent search for inter-chain contacts
Merge branch 'master' into develop