A lot of changes
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Auto clustering enabled
Auto clustering enabled