Merge "Fix a bug with worksource propagation."