Fix bug in auto slot management
Merge branch 'develop'