Remove common.sets
Merge branch 'issues/108@v1' into v1