Dev Sync (8)

Tied to DS16. Bug fixes.