modifications to prevent workspace load order problems
Merge remote-tracking branch 'origin/ribbons' into ribbons