Merge pull request #1084 from andrerod/dev

Multiple fixes
Merge pull request #1088 from andrerod/dev

Fixing slot issue on create
Fix typo in slot
Merge pull request #1091 from andrerod/dev

1089: Fix error message
Fix incorrect reference
Merge remote-tracking branch 'upstream/release-0.7.5' into dev