Merge on Stuart repo
Fix shutdown
Fix region creation with attributes/shortcut