Rolled up workflow patches.

Includes:

* a749f7e4f189bbe8271cf6ddbef353872796a0c2
* ee0a692d242abe036607b3360283b7623abff320
* d7eb0f0575f49af31dc9b7d884b76205362807ba
* 30c0f69e3c95de5413bd6b6f88eb1b8a0a7d4df8
* 7f2a4764ce6cbf5d6aa51cbb0c5204362395bad7
* f03921081468ad54a75e80b630c9556229784625
* d0bcd418a5ccf399c0a839c3dd92f4f2cfe51d9e
* 8748cf938b6949afb1fd496edb853b6e8346ae0c
* 0b282063254f68e50f64bdb6dafb1eaff0e33499