Dev Sync (14)

Tied to DS25 - Bugfixes, etc.