Disabled orphan detection, we will handle them differently in the future.
Merge branch 'master' into develop