Merge pull request #2050 from 9rnsr/fix10102

Issue 10102 - @disable incompletely implemented