Re #10841 This should fix it
Merge branch 'bugfix/10841_BinningCanBeNone' into develop