Merge branch 'dev/comp-workspaces' into for-chris-4.7-20160525