Merge branch 'develop'
Merge branch 'develop'
Fixed order of hive plots in panel to maintain original rule order
Merge branch 'develop'