Merge remote-tracking branch 'origin/feat/159-automation-component-skeleton' into feat/159-automation-component-skeleton # Conflicts: # proto/automation.proto
