numberBuckets as property
misc
Merge branch 'develop'