Initial control implementation
Auto-generate control IDs
Merge remote-tracking branch 'origin/master' into control
Merge branch 'master' into control