Merge branch 'Generalize-measurement-and-control-tables'

No channel available for Injection yet.