Changes to support easy demo of dev/qa diffs.