Issue 1193

Branched off of 1191 to make testing easier for Ops (that should be merged first).