Note about clashing unknown shapes
Merge branch 'master' into refactor-standardwhelk