Merge branch 'workflow-size-optimizations'