Merge branch 'hotfix-2.1.1-reorder-list'
Version bumped to 2.1.2
Removed some slots.

Now we have a total of 30 slots as defined in the meeting.
Merge branch 'hotfix-2.1.2-less-slots' into develop