Merge branch 'develop' into cluster-table-enhancements