Dev-page watermark support. Working, but still dirty.  [BugId: 179]
Cleanups [BugId: 179]