Merge pull request #2052 from 9rnsr/fix10115

Issue 10115 - More @disabled holes