Merge branch 'zecke/features/extended-control'