WIP bucket types
Merge branch 'bos-bucket-type' into develop